rename gen-noop to gen-spotify
remove all custom wrapping