Just a bit of tidying up. Removing redundant imports and experimental
classes