Halfway the cleanup