Spring Clean Up

Clean up