remove some comments - will be better described in the design documentation