removing some broken code