Don't need settings anymore
Remove dead code and tidy up a bit