Removed unnecessary database call