Removed lots of old garbage, and added Simple_form