removed the remove_const templates because they were causing compiler errors.