Extensive clean-up of unnecessary imports and extensions. This will aid to see the relationship between different modules and minimizing the number of package dependencies.