Removing unused datastructs