clean up with fixed paths