Move to centralize code.
File cleanup