COMMON code cleanup