Removed unneeded TODOS and commented code