Drop unused code. Spring cleanups! \o/