just remove some C constractions and add few classes