whitespace
remove obsolete comments and path variable
Merge branch 'fixes' into develop