Removed commented out lines
Merge branch 'development' into development-work