GPII-271: Removed two unnecessary classes for partially and fully expanded views.