Removing these as they are no longer needed
Also, does not seem to be used anymore