got rid of more comments