removed Streams and added changes to Database.clear()