Clean up of the work order controller