Fixed performance bottleneck (it was the  calls)
Cleanup spurious dependencies