Removed some 2.1 TOC stuff that I accidentally moved to master