Eliminated extraneous setup code