Removed some TODOs, cleaned up useless code