misc cleanup
move Handles from state to values