Code cleanup
Dependency cleanup