removed some transition code