Add/remove program's classes to/from database on save when editing program
Clean up files leftover from merge