Remove sub field and migrations

Signed-off-by: Adam Lord <adam.lord@gmail.com>