Cleaned up device filter wurfl code.