deleted a few unneeded things