removed some code not needed