Removed unused code and files