Remove dependency on fanstatic