more cleaning up paths