Removed unneeded references to traits