Remove all unnecessary configuration madness