Remove obsolete cleanup; handle manifest file.