Removed annoying database check