Remove remarks
Merge branch 'liora'