Small fixes;
Removed unused classes.