A bit of cleanup and fixing production ini