Remove pre-4.1 conditions on code