Refactoring. removed unnecessary code added for unqlite test.