Remove redundant calls in Database