Hammer's clean up