remove dependency, change status check