Removed confusing function call.

This addresses #26 and #15.