Fix last lingering bug - it works!
Cleanups.