take out this commented out code too