Spring Cleaning before 0.9.9