Removed @self and @Trait.