Renamed Attribute->Trait. Finished the removeTrait and remove Entity functions and tested