Cleaned up plane testing DMP code