Removed todo comments
Updated dependencies