remove other historical differences from the senslab branch