[dev] Code cleanup.