Added cleanup to keep database size constant