Migrated across to block based switches
Delete dead code
Delete dead code
Delete dead code
Minor tidying