got rid of unnecessary TODO