Remove some notes and swap some things around