fixed bugs - removed unused classes