instruments: changes in comments and todos
instruments: cleanup files