removed superfluous database construction