Removed more unneeded consts