Why have you moved things over to a new class that doesn't add any benifit?