Removing debug calls