Remove unnecessary database lookup