got rid of old code and unnecessary comments