Tidy up and stupids removal