Cleanup

Remove experimental code.