Cleanup:

 * Removed unnecessary type definitions