removed what I percieve to be unnecessary duplicates