More framework cleaning.