parachute code clean up.