Eliminated unnecessary code