clean up some stuff in mobile api