fixes #14 and removed some unused classes