Accidentally committed unintended code

Related to issue #16