Clean-up of ADB Interpreter & Reader