Debug flags, unused variable removed