Removed InsertionState code; cleaned up the findInsertionPoint code