Remove uneeded stuff
Remove duplication
Remove cruft
Move stuff around, to appropriate place