Maintenance 2

Redundant Class