Removing a few more things that this won't use.