Fix gap at bottom of toolbar and remove unused code