Removed fixed TODO's