Performance optimization - removed senseless code