Remove more dead code
Move stuff around