Clean up
Update modes