A bit of path variables cleanup