Removed unused class
Bugfix
Bugfix

Fixed various bugs.