Upon withdrawing request by Ville, the references to definitions have beem´n remove again