Removed unused functions and files