Remove unused code, clean up some tabs
Purge remaining tabs
Continued cleanup of unused code