cleaned up imports and other warnings