removed some (as of now) useless code.