Remove duplicate file and tidy up \o/