testing code cleanup