remove some debugging logging and move around _common_system