Cleanup and new create method for feature and geometry