remove deprecated and/or/not that cause compilation errors