remove some f from public, change avatar storage