got rid of uneeded code