Cleaning up ohs