clean the proposed code

removed crufty declaration and else branches unused