Remove properties.

Clean up imports.
Clean up imports.