Remove unused constant
Make unnecessary global variable local