Eliminating P-Traps