- Some more cleaning

Signed-off-by: dgrat <dgdanielf@gmail.com>