Removing stuff we don't need presently in support