Clean up

SurveyCommand is now done fully over the Jython interface consistent to
client command handling