Some params cleanup