Removing skyway local dependency