Removed unecessary type definitions, removed an unecessary cimport
statement, and rearranged some import statements.