Minor dependency changes and removed debug