Removed unnecessary references in classes.