Move stuff around and delete extraneous junk