Defaulting Issue with Preferences
Changes for Release and local repo
Cleanup imports