Resolved issue, removing todo