ROACH2 support and cleanups