Cleaning up post place tower refactor