Changed some DB cleaner stuff