removed redundant path stuff