Dirty source code removed, fixes #4