Removed more non-vanilla stuff. Please read the instructions, folks.