Minor code cleanup

Remove unnecessary references