taking out some unneeded code