Tidy up

Remove all the unneeded stuff.