remove unused code and start on create