Clean up significant controller to implement the buckets we actually want.  Leave in some extraneous routes so the home page doesn't blow up.
EVERYTHING WORKS