Finally removed unecessary worldly variables

Conflicts:
	repodefiner