Partial commit #7
clean up files