Better clean for not required values