Remove PMTPA remnants

Minor code cleanup
else if -> elseif

Change-Id: I17fd2864420e4697d3e308934d8d723d3ff3c55b