Commented out some broken code