Remove obsolete code.
Merge branch 'robert'