Did some spring cleaning