Remove placeholders where there doesn't need to be one