Formatting, remove debug output, really fixed expiring listings again