Removed extras buttons