Housekeeping, aka. removing dead code and formatting.