strip down again

Too much complexity is not useful for generic deployment