Cleanup

Do we need this in the enterprise spec?