Removed non-vanilla stuff.  PLEASE DO NOT ADD 3RD-PARTY stuff.