adjust code to use only module code, and not removed shared code