Removed trait & goal classes.