New Construction Clean up