Cleaned some debugging calls