Delete items and make everything database-backed
Simplify the code a bit