Remove and/or hide the reduntant code