Remove unnecessary const gimmicks