removing debug & old comments