Remove with(), adapt various things