using $HOME and removed unused stuff