removed some broken code