not removing database stuff now!