Cleaned up some unnecessary TODO blocks