cleanup and prepare the deprecation of multiple methods

Signed-off-by: Marc Lefrançois <mlefrancois@mirego.com>