Remembered a few more
Cleanup