Remove broken stuff for now; need to undo all the cool dynamic service name code to get parameters to work right