ticket:83 Removed redundant db query