removed some broken things