Cleanup prior to turning into module

Cleanup prior to turning common components into module