Remove empty stuff