Code cleanup.
No functions for now.