Did a bunch of refactoring, but the removal of buttons is still not working.