signature (passing locators), and remove some which obviously don't serve any purpose (untested, sorry)