Fix previous typo and removed redundant changes