Added David as author, removed obsolete lines.