Bin "temporary" code that doesn't compile any longer

Change-Id: I7550a40bab4ffd1b585ad37dceb59c38cf1e4ca3