More BODY cleanup.
Hopefully clear up everything.