Remove superseded code