removed comments and leftover debug code