Eliminated extraneous code