Prunes some useless code and some style fixes.