SBT Cleanup


@gissues:{"order":75,"status":"inprogress"}