got rid of unneeded code