Removed a few buttons (not yet tested)