Removed some transition code.
Got rid of more transition code.