Remove remnants of old implementation