Clean up favorite code