added revsion comments to context (and cleaned up some trailng whitespace)
removed some unused imports