Removed front end code, and added another class def or two.