Removed commented out code.
Removed dead code.
Fixed locking issue.  Centralised imports caching behaviour.