Removing unused types

Fixes #1344