Remove code obsoleted by partial