Delete unused

unused code, plus an old longstanding rfc difference
we should be conformant now.

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>