Eliminated empty helper classes