cleanup, got rid of files that were refactored out