Removed yet another unused module, fixed coverage