Clean up code for QA purposes