Fixing object class management issues; dead code removal