Just moving around some layouts and removing unused (I hope--specs pass) files.