Clean up manipulation methods