Removing unused values
Fixes #32 and #34