Removing leftover comments and refactoring delete filters