Remove some 2.6isms

closes #228