Removed another obsolete file and cleaned up code