Did some spring cleanup and removed unused files