Unused classes
Bug fix
Some minor changes