Removing two buttons so it's more flexible.