2.1.8 tweaks

Removed stuff not used