Fix double scrollbars on terms window
Remove some unused code