Cleaning up old junk ready to do some development