Code & config cleanup
Dependency cleanup