default traits and classes removal fixed