remove thread stuff, make sure to clean up tabs
remove unused method
Merge branch 'acutally-fix-tests-this-time' into dev-gradle