Clean up for a prod push so can start grade stuff