Deleting before commented code
Merge remote-tracking branch 'origin/fixissue219' into fixissue219