Merge pull request #5 from sjanc/incubator

Remove incubator leftovers