remove database use + fixes