removed some unneeded things