removed debugging statements and old code