Updated database schema version. Removed some TODOs