Remove Unused references