Remove trailing white-spaces where applicable