Remove unused line.
Lots of changes I've forgotten to commit.
Merge pull request #1 from TonicArtos/master

Merge in upstream