Missing part & cleanup.