Removed redundant types.

Moved things around a bit.