#83: Drop support for 2.5, 3.2, code cleanups