Removed old unused code, cleaned up the file