Remove a few unneeded things