Durst codecleanup