Some cleanup and grunt copy