fixes #10 and removed some unused classes