clueanup

@jerrinot ,  arbitration