Removed DB-related code