Experimenting with automatic deletion

Still messy code, hard-coded values all around