Remove configs not used
More cleaning up