some code cleanup tasks