Remove a lot of unneeded consts