Remove redundant passing of id