More clean up for production