cleaned up development code as per @voxpelli in issue #79