Code cleanup.
Planning fix.