Removed hated functionality!!!

Fixes #48