Remove unused variable
Update database
Add keyalias
Merge branch 'master' into alarms