Remove some crap and move some things for merging