removing some unneeded code