Removing superfluous class