clean up code & rm unused files