Remove deprecated and redundant code

Removed old code which uses a method which is not present anymore and
code which is redundant.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>
Refactor Accuracy metric

Just reordered some code in the Accuracy metric implementation.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>