Removed some unused stuff
Conf update