removed unused stuff, fixes #10