remove old code, add comments