deleted some unneeded code