Removed accumulating warnings