cleaning up for production