Removed some stuff we no longer use
Merged