Clean up Refactor artifacts