Some spring cleaning. [admin]