Changing to PostgreSQL
Removing commented SQL statements