clean up, test code removal, lza extended for DP