probably should include comments on the expert side!
removing unneeded comments
Merge branch 'development'