Change the way configuration loads + cleanup