Change migration to not need additional key and clean up old keys
Cleaned up old settings defaults