Removing database stuff for now