more cleanup of soap related functions, options, and imports #261