code style tweak

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>
removed unused class

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>
removed unused class

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>