Simplify partiotion a bit; remoeve trial code