Removal of redundant code :smile: