Removed todo's out of the code