Improve perfomance
Clean unnecessary transitions