Removing database dependency.