Removed custom database queries