cleanup, sync test settings -> prod where sensible.
removal of lots of non-used, commented out features.