Clean up some invalid doc tags and unnecessary ref to Avalanche class
Remove invalid/unneeded method
Fix conflict on merge with TomAdam/pr_cleanup branch
Merge remote-tracking branch 'tomadam/pr_cleanup2' into new