Remove some H2/PostgreSQL conflicting code
Remove plurial on assets
Merge