Code cleanup
 As with d in core