Removed debug messages and restored filter