REF: Remove not used code