removed a few unneeded things