Removed unnecessary DB operation during initialization