[samjsharpe] remove more stuff I never use