got rid of junk code