Cleaned up anonet
Manual merge of PR from frabcus