Testing code cleanup