Clean up imports.
When add Features to a Layer make sure the Geometry is always set.