rhygaar avatar cleanup