removed unnecessary database stuff