Removed unnecessary classes from melbourne.master