Remove unneeded db select