Remove Buftabs_enable()
Tidy up main file