cancel menu
remove database use + fixes
merge