Removed unused functions and file