More clean up to remove changes for production