remove remaining activation-to-string, some cleanup