Small code change and removal of redundant code