Removed unused button
Minor refactoring