cleanup, fixed paths