Cleanup and remove filter