Remove comment
Comment some functionnalities.