Taken-off un-necessary commented blocks