Cleaning up from tower place event refactoring