fixes according to comments in pull request #121
Removed unnecessary import
Merge pull request #1 from doddo/pgustafs-1099456

fixes according to comments in pull request #121