Clean up #2