Removed extra database commands