Remove some redundant code

Remove some lingering commented out code and the methods we didn't end
up using in the final implementation.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>