Some redundant code was removed