Cleanup for better testing