swift234

Remove some old code, add an assert to get an assert instead of null pointer deref on invalid call.

Swift SVN r268