Cleanup in scrollbar button code