Cleaned up files to work with new server