Cleanup, more notes