MOD: remove the comments