Remove unnecessary references