Cleaning up simplying