Fix some typos
Remove left-ofer mysql fields
Further reorganization