2017-04-01 Spring Cleanup - macraft