remove broken makefile targets, fix bug in conditional
combine serial if blocks into if elseif