remove unnecessary test, add comments