cleanup for production code