Clean up account management before filter