Removed unnecessary dependency
Added todo