make Annotations visible, and remove some deleted stuff
fix console tool generator - only current command should be generated