AI-499 : fixed typo and removed redundant code