Cleanup, so its no diff against Starling::master