Updated code, removed unused classes