Remove some H2/PostgreSQL conflicting code