Unnecessary References removed