More removal of const declarations