Add references
Remove unnecessary references