removed unnecessary db request