remove unused files
some code cleanup