Remove unused hammer stuff
Change split behavior