Massive cleanup and fixed avatar path