Removed redundant couple of code