Merge "Removed unused server files"