Merge branch 'minor-fixes' into 'milestone-1'

Removed bunch of superflous annotations

See merge request !22