o Remove strict dependency on leap.common.