Remove const_cast