Some cleanup for the plater code