cleaned up unused files, functions