removed some broken bits added by github