minor code cleanup
remove unused files