Started code cleanup.
Realized I'm missing bits in dev.