More spring cleaning, simplification