Remove more old comments, commented out settings and removed globals

Change-Id: I614d0299c955084f8529b91f50caee62f59a474b