cleaned out unused items. Fixes #31