Even more cleaning up. All statistics, achievements and scoreboard functionality appears to be working. Consequent changes to views still remain.