Clean up and key filter added