Removed redundant class passing in data base access.