Some unused code was removed