Remove in a separate commit?