Clean-up

Commented out some bad experimental code.