Remove unimplemented leftovers