Remove accidentally checked-in script
Refactor to handle rebinding
Add memory checking in unit test