CommanderApplicationContext -> CommanderContext
cleanup