Trimmed some unused references