Removed old and unused references to button flags