Remove references to undefined home
Unused things removed
Directories sorted out and plotting added