Star neighborhood cleanup

Star neighborhood cleanup

Star neighborhood cleanup