* Remove non-common code to prepare moving the include to common