got rid of unneeded piece of code