remove extra deps and making more responsive