remove smoothstate for now