Cleaned up unused references