Cleaning up for spring

Cleaning up for spring