Removed unused classes, added last of gui