Cleaned up transitions