cleanup; remove references to fanstatic