Remove traits once again. I just can't find a way to do them properly.