Remove more structure that is now unused