Unused function removal. Solve part of #110