more path cleanup