Cleaned up dependency checks.

Cleaned up DARK/Light check.