Remove some pragmas; simplify