I've left most dead code inside the architecture specific bits as I'm not sure if it won't be used in the future.