Removed unused files and refactored join code into sites controller