performance, tidy up, remove Config