Clean up and Build fixes