Some production cleanup