Const cleanup