code cleaning after switch to no limits universe