Code cleanup from Stratos dt2w merge